|
|
@@ -528,13 +528,11 @@ def statistic_member(request):
|
528
|
528
|
|
529
|
529
|
# 消费者统计
|
530
|
530
|
if start_time and end_time:
|
531
|
|
- users = ConsumeInfoSubmitLogInfo.objects.filter(ymd__gte=start_time, ymd__lte=end_time, test_user=False, dupload=False, status=True)
|
|
531
|
+ start_time = datetime.strptime(start_time, '%Y%m%d')
|
|
532
|
+ end_time = datetime.strptime(end_time + ' 23:59:59', '%Y%m%d %H:%M:%S')
|
|
533
|
+ userinfos = UserInfo.objects.filter(resgister_at__range=(start_time, end_time))
|
532
|
534
|
else:
|
533
|
|
- users = ConsumeInfoSubmitLogInfo.objects.filter(test_user=False, dupload=False, status=True)
|
534
|
|
-
|
535
|
|
- users = users.values_list('user_id', flat=True).distinct()
|
536
|
|
-
|
537
|
|
- userinfos = UserInfo.objects.filter(user_id__in=users)
|
|
535
|
+ userinfos = UserInfo.objects.filter(test_user=False, level__gte=1, status=True)
|
538
|
536
|
|
539
|
537
|
# 会员级别
|
540
|
538
|
level_logs = list(userinfos.values('level').annotate(num=Count('user_id')))
|